3c7d3d74422aa061acf2db09586db94088136e61,plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/EMFComparePredicates.java,EMFComparePredicates,hasNoDirectOrIndirectConflict,#ConflictKind#,1184
Before Change
* @return The created predicate.
*/
public static Predicate<? super Diff> hasNoDirectOrIndirectConflict(final ConflictKind... kinds) {
return and(not(hasConflict(kinds)), not(anyRefiningDiffs(hasConflict(kinds))));
}
/**
After Change
* @since 3.4
*/
public static Predicate<? super Diff> hasNoDirectOrIndirectConflict(final ConflictKind... kinds) {
return not(hasDirectOrIndirectConflict(kinds));
}
/**